Address some review feedback