changed to class_name from klass_name, fixed some spacing