[CMD]: Fix few comments & use ARRAYSIZE(str) instead of sizeof(str)/sizeof(str[0...