Improve code readability.
Merge pull request #7891 from s0undt3ch/develop

Improve code readability.