Fixed more ass format matching

just remember that backslash and clojure don't mix
refactored to capture more formatting data