PEP8 compliance and CLI rename to prepare for GUI.

I ignored E501 (because the lines aren't too long for me at this time) and
E125 (because it's apparently broken in the current PEP8 checker.)