better class names