[FOLD] code review mods