XD-945 Formatting, adding JavaDocs where missing