Fixed Code Sniffer issues

sarwan vermarequested to merge
issue/trailless_menu-3439532:3439532-code-sniffer-suggestions into 1.0.x

Merge request reports