code review and changes