Better case (23/33)

Better case