Refactor CLI number 2