Review feedback: better guava usage, string concats, javadoc