More pep8 cleanup

Some hands on cleaning. Mostly refactoring comments and string constants