REFACTORING...