More refactoring in Chess