Better case (26/33)

Better case