string set instead of array where applicable
trimmed comments