code review feedback @brianr