Added comments for code review