#muc# refactoring