fixer-uppers

Made some code style fixes (braces, etc) localised a couple strings
that kind of junk