Exctracted a couple of functions in prep for a major refactoring
Merge branch 'master' of https://github.com/Clojure-Intro-Course/clojure-intro-class