[SPHERE-763] Refactoring