Datomic util refactoring