the reworked if-else control flow for the cli