Light bit of refactoring.