Clean up

Make tools Compatible with toro device