Might as well fix up pep8 issues while you are in here.