update to use CollectionUtils.unmodifiableSet

update comments