Cleanup and PEP8-ify a bit