Minor code consistency updates