ECL-98 Code refactoring