Read Class change to become more beautiful and readable