Cleanup, PEP8.