Silly refactors while looking over code base.