Improve code consistency