Callback refactoring, StaticClojure added