style changes to conform more closely with pep 8