Reformatted the class