update organisation + clean codes