some pep8 refactoring
various refactoring