minor class changes