readability cleanup