cleanup and pep8 validation