read_source cleanup
Merge pull request #134 from jurriaan/better-read_source

read_source cleanup