More pep8 fixes
Remove unused constants
Mmore pep8 fixes