Better case (9/33)

Better case