Cleanup
Seperated direction and velocity