Code cleanup
Starting on the movement sim