Better case (29/33)

Better case