modular tools cleanup
Merge pull request #142 from FreeER/master

modular tools cleanup