Further improved code readability.