COde improvements