quick refactoring