finished fixing readability issues