Make comments more clojure-like, and simplify handling of configuration