[FOLD] declaration tidying