Cleaned up core.clj