Better case (6/33)

Better case