more readability changes