refactor command params parser