Some refactoring on tools
Fixed stupid __int__ to __init__ bug