PlayerEditState refactoring