Seperate muted in case they bypass filter

Also, began cleaning up, trying to group simular methods