quick refactoring.