Additional code cleanups
- sprinkle in @Overides where they should be
- using braces on ifs, elses, and whiles is almost always a good thing