#1 - More refactoring.