Removing hardcoded class name