Refactoring CLICommand.java (#4641)

* extracted duplicated code in method

* removed unnecessary assignments

* added back variable to reduce duplication and changed name of method

Co-authored-by: Helen Spry <spry@Helens-MacBook-Pro.local>