Bit of refactoring.