[FOLD] More tidy