Changed all references to Closure to callable type hinting