* cleanup and fix PEP8