more readability improvements