Wee bit more refactoring.