changing case statement convention