Refactored String/Enum Set helpers + checkstyle fixes

Change-Id: I03b6d057d3e846d98a38022c9e956ab53d11327c