Fixed quick refactoring oversights.
Merge pull request #6 from dwtj/master

Converted all 4-spaces to tabs in c-files to make consistent style.