More ClassPane refactoring