refactor: remove references to Definition
Merge pull request #111 from mtrberzi/issue89-refactoring

refactor: remove references to Definition