A bit of refactoring.