Refactor to simplify, using Collections.unmodifiableSet