Coding style fixes to make pep8 happy