class name refractored