Began to make module pep8 conforming