Full code review

Full code review
Done. I adopted the approach that you mentioned.