some cleanup
Merge pull request #13 from olivier-squid/master

some cleanup