more readable code, updated datomic