Code cleanup Tools included into Tioc file
2nd code cleanup