Mms: change to switches and small cleanups