refatoring the class name