XD-1831 Code Review changes - Add JavaDoc