MADS: Clean up of Player::move method