Some refactoring to conform to pep8 rules