Better case (28/33)

Better case