pep8 + some refactorings