minor refactor on Piece