Updating a few comments as well as a header file to user US2ConditionPresent/US2ValidatorPresent