refactor - clj style :)