Clojure tweaks

- Clojure runner slightly faster
- Code is DRY now