Remove convoluted guava set building for simple for loop, did some formatting to hopefully make merge easier