some readability changes