MUS-90: refactoring