Finished PEP8 rewrite