Code formatting for class names and command
Merge pull request #2453 from jroes/patch-1

Code formatting for class names and command [ci skip]