More code consistency improvements