More sources and cleanup
Merge pull request #3 from jacksongeller/patch-1

More sources and cleanup