Make it more pep8 friendly