some readability cleanup