Minor tweaks (comments, concise code)

Had these changes in my fork for a while, never created a pull request so I am now.

There are barely any changes, just minor things anyway.