refactoring, making model more consistent adding and removing player