More refactoring...