MORE REFACTORING!