Refactoring even more.