improve master-clear logic