Adjust case statement for readability