switch-case cleanup :lipstick:

Change-Id: I75cb5ba1578ff5416cd8fe4635852e5b835407d0