class improvements