cleanup and PEP8