A bunch of cleanup

Note: our general style is to `not` use `final` within methods.