improve class