Some readability issues