update for code review feedback