pep8 and style modifications
more pep8 and style edits
tag version 2.3