update based on code review requirements