Misc. Cleanups

Reviews: @vinniefalco, @rec
Better that we dont touch this legacy code unless we're really going to improve it