some readability improvements