[MISC] Code consistency