Additional refactoring...