Refactoring more.