[m] more code layout cleanup