Code consistency updates