Code readability issues