Just one more refactoring...