Mms: change to switches and small cleanups

Change-Id: Ic3473eaae74a040b4f61961e8607ab8e710f6262