Removed whitespace
Fixed casting of functional interface
Defined define in the definition table