refactoring: simplify command parameters