Clean up the getCallable() method