several readability improvements