Even more Javadocs
Rearranged imports and use of Guava Collections for cleaner code