cleaned up more tools