minor adjustments to code during Chyld's review