Full code review

Full code review
Moved to the bottom.