updates based on code review