More pep8/pep257 formatting
Last bit of pep8 & pep257 changes