Mms: improve style

Change-Id: I71e4cd6fb74922b1aec336887c94892aaafba126
Mms: Drep

Change-Id: I361641dce820383d2bf7bcf9d1d27ea488682939