Made changes to add suggestions from code review