Tidy wrv-model, not checked