Addressing nit comments