Random nitpicking and stylistic preferences

Make of it what you will :)