[FOLD] Small cleanups to address comments