Updated code consistency