Mass refactoring (for fun)