Some corrections to be PEP8-compliant

I also changed the name of the old main, so pep8 doesn't recognize it
as a python module when I run the command.