[Refactor] Remove extraneous semicolons

Code formatter exposed several unnecessary semicolons
[Refactor] Some manual cleanup, post-auto format

Redid some of the single line ifs that worked better before.  Got rid of
many single-line ifs.
[Refactor] Consistent if/else chains, no mixed braces