Minor - format code.
Minor - format code.
Minor - format code.
Minor - adding $userCourseCategoryId
Fixing removed userCourseCategory see BT#8732