refactor some command parameters to be more clear