Made some readability changes.