code readability cleanup