Code cleanup
Merge pull request #93 from futures/SourceCleanup

Code cleanup