Updated switch statement with better terminal output