Doing movement a bit cleverer, also removed some unnecessary semicolons, 736 characters