Some refactoring for pep8