Incorporated comments from CodaFi