Minor - format code, removing whitespaces
Minor - Removing unused variables
Minor - format code
Adding multiple URL support for course_category see BT#6195