Better case (5/33)

Better case