refactored the cli class