improve code consistency