Better case (20/33)

Better case