Clean-up
Merge pull request #353 from jidel/issue#351-cleanup

Clean-up