pep8, cleaner git status, some refactoring