Style optimizations
Ran fmt on all code
First shoot at localization via a file to which all strings will be externalized