Added comments so a code review is easier