INT-1197: Add JavaDocs and some polishing