Full code review

Thx :+1: :smile: