Minor: some spaces, a TODO, adding @westei as a comment author
Add @weistie to pom developer metadata
Merge commit '2d31f52350b6405d1e79cb4f9dc965024ec70651';
Some code cleanups and formatting changes;
Removed unused Comparator;