Renamed/moved self memoizing functions
Merge branch 'chapter4'