simplify move logic