Fix uqam cost-of-move
Small cleanup