Group similar commands
Remove redundant argument

Since the argument parsing strategy requires that the arguments
are given in a specific order, we want to minimize the number of
arguments for each command