updates based on code review comments