+ Improve readability.

Some small readbility improvements. What do you think about them?