cleanup
Merge pull request #2 from etpinard/cleanup

cleanup