cleanup code; pep8