Cleanup and PEP8ization.