Closed a parenthesis I broke in the previous commit and fixed some last pep8 errors. Coverage seems to pass too, so hopefully this works...