Fixes from @frett's review.
 - added class/method javadoc