Made module matching pep8 conventions