Update haskell solution
A clojure version without regexes