More source code cleanup
Merge pull request #94 from futures/NextSourceCleanup

More source code cleanup