Some code cleanup and pep8 goodness
more code cleanup and pep8 goodness