changes made after code review