Revert "Make it possible to group commands with same keywords"

This reverts commit eb9e02995a99995d738a619aefd6081b01cd461a.
Fix coding style