Class sortable refactoring