improve class name