Code cleanup tools added