Reformat with astyle
Removed redundant verbosity checks - still needs fixing overall. But thats another story.
Enumerated the mode integers