Latest refactoring on piece/game