CMFM: Styling fixes

Change-Id: I78769218aa523f2f7e389293343a1e4b1484ea39
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>