Removed escape function for class name