Address comments of @purplefox