clarity fixes in core.clj