Better case (17/33)

Better case