Code consistency changes