Refactor Pawn class