A few readability improvements.
Merge pull request #520 from ugisozols/readability

A few readability improvements.

[ci skip]