Cleanups for load.
Merge branch 'master' of github.com:abduld/CS598