Fix mute, tidy
Merged