Fixed E225 style errors and made the pep checks "just a bit more
interesting" :P