Simplifying movement logic