Address some PR feedback