Cleanup case statement