[MF] Code clean up