Cleanup and PEP8ish stuff