Updates per code review

Props @dlh01