REFACTOR: improve the code readability. (PR #8211)

GitHub

You’ve signed the CLA, vinothkannans. Thank you! This pull request is ready for review.