bash style cleanup
more code cleanups
Merge pull request #46 from martinpovolny/cleanup

bash style cleanup