primarily nit fixes