simplified movement code

simplified movement and animation code