addressed code review feedback