Refactor Piece class