Refactoring and fix of an error occuring with 2 human players