Various readability improvements