Better case (7/33)

Better case