nit fixes for review