EVEN MORE REFACTORING