Basic compaction. Some moving around of functions to improve the story flow. Some useful but unused functions (walk) culled.
Pull out common patterns