refactor: remove references to Definition

Refactoring, fixes #89.