Now with more pep8 compliance\!