LINT
Change to be a class rather than a defined type