Better case (12/33)

Better case