COde improvement