MUS-94: small refactoring