pep8'd all the things!!!