code review feedback @brianr
code review feedback @brianr