yeah. you're right, it would make it more clear. if I'm honest I'd scrap the whole thing and write it from scratch, probably in Clojure. but that's not an option currently so we try to put stuff live and make it nice afterwards ;)