readability improvements