Updates to style for pep8-1.5.1 compliance