PEP-8-ified the whole thing