Full code review

Full code review
Changed D to M .