Refactor the CLI object so it doesn't need to be instatiated with new