Fixed readability issues