LD-102 small refactoring