ECL-274 - refactoring DLS and edit comments in JavaDoc