Moar pep8 convention fixes