Make some readability improvements