written universitygroupmodel, initiated refactoring