improved class names