Better case (21/33)

Better case