removed constants, added a tools .h file