Refactoring of subclassing and ListBox model