refactoring in gui model classes