Fix Formatting in CommandEvent