Improve readability.
Merge pull request #1025 from ugisozols/readability

Improve readability.