[PRX-193] refactoring