Additional formatting fixes, just installed pep8 to resolved the issues