Clean up code in Movement