Make some readability fixes