refactored definition.go removed