Move update_movement handling out of StoreEntityMovement
Return early on missing entity
Indentation