Move extra stuff out of core.clj