removed other tools, did some refactoring