Refacatoring things to use hiccup instead of static html