Made things conform to pep8