remove commented sections
fix pep8