also some readability issues