First round of refactoring!