adding changes from code review