Just a code format remark. We try to put space around + and -
```staves->at(rstaff + staffMove - 1)```