Updated WSF_FILE_UTILITIES with class comment,
and avoid having expanded generic class.