Some PEP8 stuff and a bit of other code cleanup.
Cosmetic menu improvements.