Code reform and tool addition.