Refactoring regarding user_tailoring_file and cid in xccdf_session