Add space after comma
Change command class
Add space after comma