Better case (31/33)

Better case