Better case (19/33)

Better case