Refactoring definitions