code refactoring, prepare to create model of set game