Remove unecessary clojure.string/ 's
fix bug with non-gen inputs
Make ?data look nicer