Better case (15/33)

Better case