PEP8ify everything that makes sense