Full code review

Full code review
Done.