Change the command list for better readability