cleaned up core.clj file