Better case (18/33)

Better case