Full code review

Full code review
This approach has been adopted nearly everywhere.