refactored with-ns ==> with-vars