Simplify move-handler