MP1-4420 : Minor beautifications