PEP8ified some stuff