Little bit of refactoring.