[AESH-279]
further refactoring