Improved code consistency.