Reformatted the states class