Another refactoring...