Cleaned up core.clj a bit.