OGM-600 Improving JavaDoc based on review comments