improving code consistency