Better case (22/33)

Better case