Refactor definition