Better case (16/33)

Better case