ticket:1 for #1 fixups for this ticket suggested by reviewer