improved class id