Cleanup and PEP8