code consistency pass