Improve get move weight function