\r
                                        for (uint8_t i = 0; i < UsageListSize; i++)\r
                                          UsageList[i] = UsageList[i + 1];\r
-                                         \r
+                                       \r
                                        UsageListSize--;\r
                                }\r
                                else if (UsageMinMax.Minimum <= UsageMinMax.Maximum)\r
                                        }\r
                                        else if (UsageMinMax.Minimum <= UsageMinMax.Maximum)\r
                                        {\r
-                                               CurrCollectionPath->Usage.Usage = UsageMinMax.Minimum++;\r
+                                               NewReportItem.Attributes.Usage.Usage = UsageMinMax.Minimum++;\r
                                        }\r
-                               \r
+                                       \r
                                        uint8_t ItemTag = (HIDReportItem & TAG_MASK);\r
 \r
                                        if (ItemTag == TAG_MAIN_INPUT)\r
        return true;\r
 }\r
 \r
-void USB_SetHIDReportItemInfo(uint8_t* ReportData, const HID_ReportItem_t* ReportItem)\r
+void USB_SetHIDReportItemInfo(uint8_t* ReportData, HID_ReportItem_t* const ReportItem)\r
 {\r
        uint16_t DataBitsRem  = ReportItem->Attributes.BitSize;\r
        uint16_t CurrentBit   = ReportItem->BitOffset;\r