more readability, no functional changes