cleanup code as per pep8