Refactor commands
Sort commands