minor class refactoring