cleaned up core.clj